Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to ring 0.17 #335

Merged
merged 10 commits into from
Oct 5, 2023
Merged

Upgrade to ring 0.17 #335

merged 10 commits into from
Oct 5, 2023

Conversation

thomaseizinger
Copy link
Contributor

@thomaseizinger thomaseizinger commented Oct 31, 2022

ring 0.17 has been released! This PR updates to that version.

@thomaseizinger thomaseizinger changed the title Upgrade to latest ring version Upgrade to ring 0.17 Oct 31, 2022
Copy link
Contributor

@melekes melekes left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks 👍

@k0nserv
Copy link
Member

k0nserv commented Oct 31, 2022

I don't think we should hardcode a git reference of ring like this. Until a new version has been released we should keep the existing versions. Folks should still be able to use cargo's patch feature to override the ring version until then.

@thomaseizinger
Copy link
Contributor Author

thomaseizinger commented Nov 1, 2022

I don't think we should hardcode a git reference of ring like this. Until a new version has been released we should keep the existing versions.

Sorry, bad communication on my end. I don't expect this to be merged until the version is actually released! Hence the draft PR.

I only opened this PR to make sure we can get this released ASAP once ring actually releases the new version and to be able to test that we can do what we want to do (melekes/rust-libp2p#12) with these changes.

Folks should still be able to use cargo's patch feature to override the ring version until then.

Negative. This only works if the version in the Cargo.toml is not bumped yet. ring already has it set to 0.17.0-not-released-yet so a [patch.crates-io]-entry in a manifest is a no-op.

@thomaseizinger
Copy link
Contributor Author

I don't think we should hardcode a git reference of ring like this. Until a new version has been released we should keep the existing versions.

Sorry, bad communication on my end. I don't expect this to be merged until the version is actually released! Hence the draft PR.

I only opened this PR to make sure we can get this released ASAP once ring actually releases the new version and to be able to test that we can do what we want to do (melekes/rust-libp2p#12) with these changes.

I'd appreciate a review to make sure we aren't blocked on something once ring cuts a new release!

Copy link
Member

@k0nserv k0nserv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but this needs rebasing

@thomaseizinger
Copy link
Contributor Author

LGTM but this needs rebasing

I fixed the conflicts by merging. I hope that is fine! You seem to squash-merge in here so I didn't bother with a rebase :)

@thomaseizinger thomaseizinger marked this pull request as ready for review October 3, 2023 01:42
@thomaseizinger
Copy link
Contributor Author

@yngrtc This is now ready for review.

@codecov
Copy link

codecov bot commented Oct 3, 2023

Codecov Report

Attention: 4 lines in your changes are missing coverage. Please review.

Comparison is base (ad4ceb5) 61.50% compared to head (a3f7c6d) 61.52%.

❗ Current head a3f7c6d differs from pull request most recent head 1ccc71b. Consider uploading reports for the commit 1ccc71b to get more accurate results

Additional details and impacted files
@@            Coverage Diff             @@
##           master     #335      +/-   ##
==========================================
+ Coverage   61.50%   61.52%   +0.01%     
==========================================
  Files         529      529              
  Lines       48836    48838       +2     
  Branches    12356    12364       +8     
==========================================
+ Hits        30039    30048       +9     
+ Misses       9614     9604      -10     
- Partials     9183     9186       +3     
Files Coverage Δ
dtls/src/crypto/crypto_test.rs 71.42% <0.00%> (-1.16%) ⬇️
webrtc/src/peer_connection/certificate.rs 66.98% <0.00%> (+0.31%) ⬆️

... and 9 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@rainliu
Copy link
Member

rainliu commented Oct 5, 2023

Could you fix clippy/fmt error?

@thomaseizinger
Copy link
Contributor Author

Could you fix clippy/fmt error?

It seems unrelated to my changes and likely caused by an implicit dependency bump as you are not tracking Cargo.lock in git. Do you want it fixed in this PR or in a separate one?

@thomaseizinger
Copy link
Contributor Author

I sent a PR here: #503

@rainliu
Copy link
Member

rainliu commented Oct 5, 2023

Rebase it?

@thomaseizinger
Copy link
Contributor Author

Rebase it?

I am assuming because you squash-merge anyway in here that merge was fine too. Btw, there is a setting in GitHub to "always suggest updating branch" that you can enable to always have the button for manually merging master in PR branches!

@rainliu rainliu merged commit 982829b into webrtc-rs:master Oct 5, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants